:art: get_screen_data
huangqimin001
1 changed files with 4 additions and 4 deletions
+ 4
- 4
api/eqpt_views.py
@@ -140,7 +140,7 @@ def eqpt_result(request): |
||
| 140 | 140 |
ipuis = {ipui.get('pk'): {
|
| 141 | 141 |
'fields': ipui.get('fields', []),
|
| 142 | 142 |
'observed_days': ipui.get('observed_days', 0),
|
| 143 |
- 'temperature_has_upload': ipui.get('temperature_has_upload', False),
|
|
| 143 |
+ 'temperature_has_upload': ipui.get('temperature_has_upload', ''),
|
|
| 144 | 144 |
'temperature': ipui.get('temperature', 0),
|
| 145 | 145 |
'last_submit_at': ipui.get('last_submit_at', ''),
|
| 146 | 146 |
'remark': ipui.get('remark', ''),
|
@@ -150,7 +150,7 @@ def eqpt_result(request): |
||
| 150 | 150 |
eqpts = eqpts.filter(Q(name__icontains=kw) | Q(phone__icontains=kw)) |
| 151 | 151 |
eqpts, left = pagination(eqpts, page, num) |
| 152 | 152 |
eqpts = [{**eqpt.data, **{
|
| 153 |
- 'has_upload': ipuis.get(eqpt.ipui_pk, {}).get('temperature_has_upload', 0),
|
|
| 153 |
+ 'has_upload': ipuis.get(eqpt.ipui_pk, {}).get('temperature_has_upload', ''),
|
|
| 154 | 154 |
'temperature': ipuis.get(eqpt.ipui_pk, {}).get('temperature', 0),
|
| 155 | 155 |
'observed_days': ipuis.get(eqpt.ipui_pk, {}).get('observed_days', 0),
|
| 156 | 156 |
'last_submit_at': ipuis.get(eqpt.ipui_pk, {}).get('last_submit_at', ''),
|
@@ -187,14 +187,14 @@ def get_screen_data(point=None, point_id=None): |
||
| 187 | 187 |
ipuis = {ipui.get('pk'): {
|
| 188 | 188 |
'fields': ipui.get('fields', []),
|
| 189 | 189 |
'observed_days': ipui.get('observed_days', 0),
|
| 190 |
- 'temperature_has_upload': ipui.get('temperature_has_upload', False),
|
|
| 190 |
+ 'temperature_has_upload': ipui.get('temperature_has_upload', ''),
|
|
| 191 | 191 |
'temperature': ipui.get('temperature', 0),
|
| 192 | 192 |
'last_submit_at': ipui.get('last_submit_at', ''),
|
| 193 | 193 |
'remark': ipui.get('remark', ''),
|
| 194 | 194 |
} for ipui in ipuis} |
| 195 | 195 |
|
| 196 | 196 |
eqpts = [{**eqpt.screen_data, **{
|
| 197 |
- 'has_upload': ipuis.get(eqpt.ipui_pk, {}).get('temperature_has_upload', 0),
|
|
| 197 |
+ 'has_upload': ipuis.get(eqpt.ipui_pk, {}).get('temperature_has_upload', ''),
|
|
| 198 | 198 |
'temperature': ipuis.get(eqpt.ipui_pk, {}).get('temperature', 0),
|
| 199 | 199 |
'observed_days': ipuis.get(eqpt.ipui_pk, {}).get('observed_days', 0),
|
| 200 | 200 |
'last_submit_at': ipuis.get(eqpt.ipui_pk, {}).get('last_submit_at', ''),
|